File code/core/merge.bash

Functions

• merge: Merge current branch into another branch
• merge_conflicts: See files with merge conflicts